Constify arg to xml_parse_time. Remove functions that were moved to

xmlgeneric.c

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 21fa18ae22d9e970d5296093977f6f882f81b85b..7e8d0ad1fac1f0dac14a603a31816b0fb9e2dbcc 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -463,7 +463,7 @@ char * str_utf8_to_cp1252( const char * str );
 char * str_utf8_to_ascii( const char * str );
 
 /* this lives in gpx.c */
-time_t xml_parse_time( char *cdatastr );
+time_t xml_parse_time( const char *cdatastr );
        
 xml_tag *xml_findfirst( xml_tag *root, char *tagname );
 xml_tag *xml_findnext( xml_tag *root, xml_tag *cur, char *tagname );

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 7b9830da3743eaac4ac2fbf21d5b1ac39f5e1807..fad80eaa0e5f705b81b069d9930a5456f72fea7e 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -189,24 +189,6 @@ tag_mapping tag_path_map[] = {
        {0}
 };
 
-
-static void
-write_xml_entity(FILE *ofd, const char *indent, 
-                 const char *tag, const char *value)
-{
-       char *tmp_ent = xml_entitize(value);
-       fprintf(ofd, "%s<%s>%s</%s>\n", indent, tag, tmp_ent, tag);
-       xfree(tmp_ent);
-}
-
-static void
-write_optional_xml_entity(FILE *ofd, const char *indent, 
-                          const char *tag, const char *value)
-{
-       if (value && *value)
-               write_xml_entity(ofd, indent, tag, value);
-}
-
 static tag_type
 get_tag(const char *t, int *passthrough)
 {
@@ -546,7 +528,7 @@ gs_get_container(geocache_container t)
 }
 
 time_t 
-xml_parse_time( char *cdatastr ) 
+xml_parse_time( const char *cdatastr ) 
 {
        int off_hr = 0;
        int off_min = 0;